Add help message to prefershttps

The preference requires logging back in again to set the new cookies.

Change-Id: I2602205eec752c927ac6df81545e69f5c9e70ee4

diff --git a/includes/Preferences.php b/includes/Preferences.php
index 84a3b7e..bb6fbbc 100644 (file)
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -307,6 +307,7 @@ class Preferences {
                        $defaultPreferences['prefershttps'] = array(
                                'type' => 'toggle',
                                'label-message' => 'tog-prefershttps',
+                               'help-message' => 'prefs-help-prefershttps',
                                'section' => 'personal/info'
                        );
                }

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 0ba7ccd..e5062f9 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -2018,6 +2018,7 @@ Your email address is not revealed when other users contact you.',
 'prefs-displaywatchlist'        => 'Display options',
 'prefs-tokenwatchlist'          => 'Token',
 'prefs-diffs'                   => 'Diffs',
+'prefs-help-prefershttps'       => 'This preference will take effect on your next login.',
 
 # User preference: email validation using jQuery
 'email-address-validity-valid'   => 'Email address appears valid',

diff --git a/languages/messages/MessagesQqq.php b/languages/messages/MessagesQqq.php
index 598efb4..7acaa3c 100644 (file)
--- a/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@ -3034,6 +3034,7 @@ Used in [[Special:Preferences]], tab "Watchlist". The display options refer to:
 Used in [[Special:Preferences]], tab "Watchlist".
 {{Identical|Token}}',
 'prefs-diffs' => 'Used in [[Special:Preferences]], tab "Misc".',
+'prefs-help-prefershttps' => 'Used in [[Special:Preferences]] as help text for the "use secure login" option',
 
 # User preference: email validation using jQuery
 'email-address-validity-valid' => 'Used as hint for {{msg-mw|changeemail-newemail}} field in [[Special:ChangeEmail]], when the provided E-mail address is valid.',

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index b9b8544..97fc4c5 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -1141,6 +1141,7 @@ $wgMessageStructure = array(
                'prefs-displaywatchlist',
                'prefs-tokenwatchlist',
                'prefs-diffs',
+               'prefs-help-prefershttps',
        ),
        'preferences-email' => array(
                'email-address-validity-valid',